bitkeeper revision 1.1159.183.30 (41ab4536IueE3ZCgGZUr5ralwtj52A)
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Mon, 29 Nov 2004 15:50:14 +0000 (15:50 +0000)
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Mon, 29 Nov 2004 15:50:14 +0000 (15:50 +0000)
Merge scramble.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk

1  2 
.rootkeys
linux-2.6.9-xen-sparse/arch/xen/configs/xen0_defconfig

diff --cc .rootkeys
Simple merge